Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Mon, 22 Mar 2010 07:34:25 +0000 (08:34 +0100)
committerJan D. <jan.h.d@swipnet.se>
Mon, 22 Mar 2010 07:34:25 +0000 (08:34 +0100)

Trivial merge